bitkeeper revision 1.1389.5.51 (4280b7c3zTKZxZNOTWdOco0qdNV2yQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 10 May 2005 13:31:47 +0000 (13:31 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Tue, 10 May 2005 13:31:47 +0000 (13:31 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean


Trivial merge